Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bugfix: CMake compiler_definitions inconsistent with jana_config.h #313

Merged
merged 12 commits into from
Jul 12, 2024

Conversation

nathanwbrei
Copy link
Collaborator

Moved definitions for JANA2_HAVE_PODIO, etc into JVersion.h.
Removed jana_config.h completely.
Removed dead code relating to libnuma, Xerces2

Previously, if Xerces was present on the system, but the user set USE_XERCES=0, jana_config.h would nevertheless set JANA2_HAVE_XERCES=1 and enable Xerces-specific code. Furthermore, if Xerces is a non-system install and hence not discoverable by CMake, this causes compilation errors.
ROOT_USE_FILE _appears_ to be broken due to RootMacros.cmake being moved to the modules/ directory (Alma9 container, CVMFS /group install, Root 6.24.04). Luckily, ROOT_USE_FILE doesn't appear to be necessary (because macros such as ROOT_GENERATE_DICTIONARY are imported directly by `find_package(ROOT)`) or desirable (because the whole point of ROOT_USE_FILE is to pollute the global CMake includes/targets/CXX_FLAGS/etc). So it's an easy fix to simply remove all `include(${ROOT_USE_FILE})`.
From xerces.apache.org:
> If you're looking for information regarding the old Xerces 2.x library, please be advised that Xerces 2.8.0 and all earlier releases are 100% unsupported and should no longer be used by applications.
JANA's NUMA support uses information from `lscpu` or `/proc/cpuinfo` instead of libnuma. Libnuma was insufficient because it didn't provide information about sockets or hyperthreads, and JANA2 constrains affinity/locality at any level, not just NUMA nodes.
- Converts all #ifdef's into #ifs
- Removes flags from compile_definitions
@nathanwbrei nathanwbrei merged commit e6d4fcd into master Jul 12, 2024
3 checks passed
@nathanwbrei nathanwbrei deleted the nbrei_config_fix branch July 12, 2024 05:33
This was referenced Jul 12, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant